gtkwindow: Enable CSD when windows set a titlebar

https://bugzilla.gnome.org/show_bug.cgi?id=706529

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index e4becaa80657c9e1f635cf9f77616266ec3330a8..129594b090ba96b6e980b20967a84e5e1530df99 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -207,7 +207,8 @@ struct _GtkWindowPrivate
                                             */
   guint    gravity                   : 5; /* GdkGravity */
   guint    client_decorated          : 1; /* Decorations drawn client-side */
-  guint    custom_title              : 1; /* app-provided titlebar */
+  guint    custom_title              : 1; /* app-provided titlebar if CSD can't
+                                           * be enabled */
   guint    fullscreen                : 1;
   guint    tiled                     : 1;
 
@@ -3543,7 +3544,11 @@ gtk_window_set_titlebar (GtkWindow *window,
 
   unset_titlebar (window);
 
-  priv->custom_title = TRUE;
+  if (gdk_window_supports_csd (window))
+    gdk_window_enable_csd (window);
+  else
+    priv->custom_title = TRUE;
+
   priv->title_box = titlebar;
   gtk_widget_set_parent (priv->title_box, widget);